From 9b30e445a8e3a246f5042b3d198d7f18b32a7308 Mon Sep 17 00:00:00 2001
From: Glenn Morris <rgm@gnu.org>
Date: Mon, 23 Apr 2007 01:20:02 +0000
Subject: [PATCH] *** empty log message ***

---
 lisp/ChangeLog | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8f41996d6ed..4a57dcd04ad 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -2,6 +2,9 @@
 
 	* button.el (button): Use color for this face on a tty.
 
+	* files.el (magic-mode-alist): Allow for carriage-returns in
+	html-mode entry.
+
 2007-04-22  Richard Stallman  <rms@gnu.org>
 
 	* emacs-lisp/easy-mmode.el (define-globalized-minor-mode):
-- 
2.30.2